From 32e21f2be67d7aae6bd83351d16c0a5500c4830d Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Tue, 2 Mar 2004 20:51:40 +0000 Subject: [PATCH] Remove conflict markers --- ChangeLog | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 5 files changed, 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d98c6409a9..96f6127e6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,7 +105,6 @@ Tue Mar 2 17:55:31 2004 Matthias Clasen (gtk_file_chooser_default_get_resizable_hints): Test the resize_horizontally pointer, not the deferenced pointer. ->>>>>>> 1.5102 2004-03-01 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d98c6409a9..96f6127e6f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -105,7 +105,6 @@ Tue Mar 2 17:55:31 2004 Matthias Clasen (gtk_file_chooser_default_get_resizable_hints): Test the resize_horizontally pointer, not the deferenced pointer. ->>>>>>> 1.5102 2004-03-01 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d98c6409a9..96f6127e6f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -105,7 +105,6 @@ Tue Mar 2 17:55:31 2004 Matthias Clasen (gtk_file_chooser_default_get_resizable_hints): Test the resize_horizontally pointer, not the deferenced pointer. ->>>>>>> 1.5102 2004-03-01 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d98c6409a9..96f6127e6f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -105,7 +105,6 @@ Tue Mar 2 17:55:31 2004 Matthias Clasen (gtk_file_chooser_default_get_resizable_hints): Test the resize_horizontally pointer, not the deferenced pointer. ->>>>>>> 1.5102 2004-03-01 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d98c6409a9..96f6127e6f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -105,7 +105,6 @@ Tue Mar 2 17:55:31 2004 Matthias Clasen (gtk_file_chooser_default_get_resizable_hints): Test the resize_horizontally pointer, not the deferenced pointer. ->>>>>>> 1.5102 2004-03-01 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): New -- 2.30.2